Merge from stable.

Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from stable.

	* gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
	unref it. (Fixes memleak, patch from Kjartan Maraas).

diff --git a/ChangeLog b/ChangeLog
index 658467f45826b6a35c5bfdeeb9aa1b40eaad6937..59f0fe0ab2a666b3efbf3cfeb3a4d0aa79a378d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
+       unref it. (Fixes memleak, patch from Kjartan Maraas).
+
 Wed Sep  3 21:38:26 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 658467f45826b6a35c5bfdeeb9aa1b40eaad6937..59f0fe0ab2a666b3efbf3cfeb3a4d0aa79a378d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
+       unref it. (Fixes memleak, patch from Kjartan Maraas).
+
 Wed Sep  3 21:38:26 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 658467f45826b6a35c5bfdeeb9aa1b40eaad6937..59f0fe0ab2a666b3efbf3cfeb3a4d0aa79a378d4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
+       unref it. (Fixes memleak, patch from Kjartan Maraas).
+
 Wed Sep  3 21:38:26 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 658467f45826b6a35c5bfdeeb9aa1b40eaad6937..59f0fe0ab2a666b3efbf3cfeb3a4d0aa79a378d4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
+       unref it. (Fixes memleak, patch from Kjartan Maraas).
+
 Wed Sep  3 21:38:26 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 658467f45826b6a35c5bfdeeb9aa1b40eaad6937..59f0fe0ab2a666b3efbf3cfeb3a4d0aa79a378d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Sep  3 21:58:03 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL,
+       unref it. (Fixes memleak, patch from Kjartan Maraas).
+
 Wed Sep  3 21:38:26 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c,

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 55376d177b4cf80c8880180b87a8a15688e19deb..75e74ac12183783d4cbc5a988eb704db65725047 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2522,6 +2522,9 @@ cached_icon_free (CachedIcon *icon)
 {
   g_object_unref (icon->pixbuf);
 
+  if (icon->style)
+    g_object_unref (icon->style);
+
   g_free (icon);
 }